Made modular and added percent.