Updated for serial parsing