Upon is now a synonym for when