add remove before adding to avoid adding twice and correct loo