Merged versions 3
Merged version 4