Merged with Sjaan part II

SjaanMerge