Add-remove working properly