minor changes to make it all work.