more changes. round#2 in the omorning