changed some checks