Update after more review