More unhrdcoded times + trimmig spaces.