More improvements. Added versions.