Feature/fix change instances