changed some rules