*Removed Original Code
*Added modular code