Lets restore the inline return and remove the if{} block