maze loading performance improvment
merge with heaven
merge some more