Expand a bit the code