now in correct template