This should be moved to the new method as well (that was my point).