Updated Parser to work with HW3