Probably still in. I'll give the changes a read over and I'll create a CS when I get home from work.