Looks like I have to change more code than I thought...