old Main class changes