Generic revision to help with merging