Switched to component/jquery