implemented remove/add behaviour/events