Doing it right this time