- lots of sync fixes with mena