changed some timescales
moved to template-based processing