new fixtures, updated templates