new style and bug correction