Switching to Smart pointers for good !!