revert from last commit, too much memory required :(