Prepping compatibility

merge fucked up so re-committing