merged katja's and mine