Changes #346