Changes to accomodate [] in varnames