WIP: fixing site mesh