For test env
EMG fix
Add first Q class Selection