Math package modified, partial coverage