Added extra time and penalites time handling.