Manually merging stuff from Jakob