add @ $$ support