Update to Lib

Fixed methods, moved protected method to private.