interim checkin ,some refacotring , trying to enable multihop