Captain reworked a bit