giving up on serial for now
fixed merge conflicts