improve formatting
use improved upgrade mechanism