Bug fixes / Different block loading method