Delete Old solution
Updated solution