Added auto-color