annotations + export update