Updated to work with new selector