Continuation of day-night system, works but still some bugs