Improve spy