Added Alex's test/live mode switch