Performance related changes - 2