Change return to bool|void