small refacto before change in update
working again
refacto
refacto
refacto