Now works with 5.2, reduced logic, added {{ . }}