corrected to former version
moved to new registry
minor arrangement