Updated lib2safe