rework REVISION hackery