Added my boolean function and changed some variables