editing with Nina, most of the issues are resolved