updated for style