added some updates to make the select case easier