sync internals with mirt dev