Merged Two solutions