minor changes - better aliasing and basic update vs update