Rewrote some code & added missing .so