merged with old version