updated to latest components