Moar changes!

Syntax changes