edited Tom's template