added ramp-up time calculation
merge between pam and bobs version