final testing changes, hopefully.