Added more control variable - easier to debug...