Updates for GoPart to work