Unchecked changes saved that will hopefully lead to a smaller footprint.
Added simplified block resolution