Ok this is stuff you added so I will try to retrofit this in.