updated model and SW for select