#71: Use selectors instead of inputs