Part 2 of last commit. Thanks, Jake :P