Changing return type to be boolean, instead of int