Compilation errors solved!