changed some isset