unfinished unit selection added