Version 4

Version 5

Unrelated and tests