Adding upgrade path and reversing pointing options
Fixing other versions