Update for stand-alone bit
merge