Another lovely change when i could have done it with triggers :)