style update, better performance