restored to earlier working version