Fix import
Further 3d commits