Added toggling for stretch goal