* Much improved, smaller code base which still supports debugging