New syntax working
Cleanup