finalize first (untested) hack