removed copy/paste of canHandleAdd function