changed some of common