update to more flatstyle