updated for lib support