Higher level separation

My shot at #66 separation

Tried to avoid any drastic changes