Pulling in other contributions and changes