fix bugs, preload diago