Changes....some incomplete