Reverted to 2 popup method for Add Command