Modified auto session stuffs