Added time and few other changes