Fix table
working towards new keygen