Changes from community.