merged with previous version