Added more options and clean up time calculation