That's the combinations we want! And some minor changes.