Remerged Umbrella.java commit