simplify & update connect-assets