updated to flat style