tweaks + getSelected method