added calculation for salary and tax