Trying different method of getting Ninja back
Added serial number fix