Revamp of everything

Pursued a new avenue.