Improve style, add real version -- for updates