added proper layering
removed debug *garbage