Changed some function return values