some of changes