tidied ... really need a post hook
centralised peeking