Merge syntax changes

I like this way better, thanks :D