added extra return for functions that actually return a value