More progress on import