And do it right this time...