updated to support lib