Merged with version 2