Reworked selector and returns