more-or-less done with 2