Merged with Sjaan part III

SjanaMerge