Rework and new style