finished changes and going for testing