more changes - 2