Mind uploading your full source so I can look at again?