Redone some of the strucure - it2