Merge added and tested