Replaced validates_timeliness with DIY solution