Integreation the old component