Updated libs & wip