updated popTemplate
partial