variable expansion added