Revert to working version
..
everything's messed up