Logic change for :: @@ $$ etc