Import working again and faster