Changes #469