T61 -- Commit 9 : Prototype->Layout edited