added hour checking