Cleaned up daylights functionality.