Re-order and add shotpooter