added modifications to forked bolt. added bolt resolver. #1020