Last update, fixed templates