Changes #477