Logic change to use otherwise unused code