Merged stuff from Trumtrum.