Added switch to avoid repeating nominal calculation