figures renamed
templates modified