Improved with support for 'all day events'