Fix and Lib added