Ahh sorry - was this not your code? Reviewing this is tricky as some stuff is old :)