Enhanced version. Working brilliantly!