9.2 work

Refactored