Updated Parser and Main