Switch to ms, instead of seconds to be more consistent