merged with latest version