rev_A

Improved geometry prototype