Added in check if times are set