Merging lars changes for PsN course