Some testing done, only small changes