actually do it right this time