Moved to getTime instead of Date objects