Merge portfolio and updated some libraries