Improved const-correctness
Better fade?