almost fixed
start of selection work