Added full functionality to choice 1