Updated Attach/Detatch