Some fixes/changes of the basic idea