Updated main a bit