Changed some funcs to bool returning