Re-adding 6- and 12-hour options