added stuff to local
added z
changed aa
merged: