I am not able to make sense of changes to this class. I will merge it for now and we can later remove it if needed.