working version needs occupancy optimization