With Saif

the final shape we went with, which i consider was the easier solution for overlaps than the one i was already proposing