changes to get it all to compile