Link + update from ilogos
Removed old decoration code