Updated code to use new Lib code.