added salary calculation