added 8 and mod 25 and 7