Adds in code that was missing from the last commit