make local version working at least