Changes from vollerthun-lappie