Some modifications to the occupancy analysis