removed layer body
preping merge
merged changes