Added back library functions