Merged with version 1