changed some solutions