Slight changes to boolean for ease of testing