Major changes, seeems to be working