VE-566 went over the logic one last time and it should be cleaner now