update style
merge from my notbook