merged in template change from SimpleMedia