made some minor changes. Does not build