Further working version development.