rebasing ... fixed compilation errors