changing to match spec