lazy and other

My last work ...
jenkins, test please :-)