minor chnages to context and timestamp