I think I got it right this time