Merge stuff from Åsa and Anders