Fixed package issue and added new estimated times