Switch to using return