Add shorter time, few other things