Greatly improved snippet