made more go like - moved away from component interface.