Fix Main Again