Do it right this time