Changed return codes