update to cosmetics
merge