Remove all the return and switch back to a