better date and better checking