Heavy Update of Comp-Manager.js