Design Changes

Changes made to improve the program