#557 finish with styles