kevin OH NO and add of remove button