Changed return functionality