Captain/Tony edit