Updated to fix starts_at and ends_at bugs