allow more than one umbrella to be in use at a time
merge: fixed umbrella bug