added full salary calculation