I think I've got it, for real this time