added bypass logic to  parse method