fixed add, remove and authentication