Split out the functions to different ones and fixed menu options
selection loopback
Splitting a function into 2