Changes based on review
fixed module alteration issue