Added return statements to bools