Added modified fix_umbrella and library