some mods to Grid functions