changes to get this to compile