changed some places