Changes #350