substitution now works (sort of)