minor
moving logic to shellfire