Updates to simplify.