Added most of the old blocks back function awaits