tweaking it to work with component, and removing flufff