Updated parse code