Changes to get the damn thing to work