added day and night