changed to keep others commands
added the trunk layout definition