Adding in the rest of the last commit