Minor update to get selection working