now handles minutes/hours