Fixing old and adding new tips