Changed the following modules according to new tax design: