Reorganised+started tweaking