Added check of a date is in a range of dates
Removed all __ calls