Moved Setting of valuesAll to inside If