Changed client code to menu driven code