Final rest changes... hopefully