upgrading to new style and build