Getting closer to final version.