More checks.
Solve performance problems.