Lib upgrade
Make Nop private
Lib upgrade