Fixing up template slightly for moves