New Changes

New Changes made to decouple the program