Corrected to properly leverage the new -N attach_unit switch