Added full functionality to choice 2 and 4