Forgot a few new changes from last push