improved static, pushing for autobuild