Added recommended changes take2