Changed some bool logic to better match variable names