improvments on time wasting assumptions