Changes to serial implementation