Final changes before v1.1.1 debugging