working on fixing compilation problems