almost done, need to remove more hours