Redesigned attach/detach