tidy up and figure out inconsistent between seria and parallel version