just a few changes to 'add' case