Level Selection logic Improved