Substituted some returns with breaks