added blanket coverage
fixed merge conflict with HEAD