Updated some logic

Preparing for move to new development hardware.