all compilation errors removed