Some inprovement to design, going really slow.. :(