loading speed impoved
merge code