This sucks. Update 3