this should make it all work, had a commit that didn't work?