adding Auto load and expand