Updated with dusk time stuff