cleanup
integrated new template