Modified so it uses parsing class