Change selector to make this more generic