2nd part of work implemented. Now, just adapt old work...