More syntax changes #4