more changes 1,3,4