more changes 3/4