Reverse mode changes

Addresses bakape#85