Created by: inailuig
This is in preparation for completing the TODO regarding blocking the computations.