With bug fix and more blocks