Fixed merged
Reminder is done