Changed to use bools