small changes with block order and labels