add new method in CalculateSalary and fix issue from Diana