Most difficulties resolved but still some issues