introduced some more organization