Fixed dates
Added more functionality