first working version after re-org