Reorder lines for consistency
Use dynamic id()