Abdullah - New Emergency Locations for combo
Abdullah - correction to method call