Updating code to use convenience selector