Proper companion item control!