Hopefully did both the things the last commit claimed to do