Second part of implementation.
One issue left.