port the components to 0.6