Made changes, added libs