corrections pre merge