Changed return mechanism