New updates and some new control flow