Nikki's changes for var assignment -- number
merge