Made huge fix on design of program