updates including change for v508
additions