Process changes suggested by Friso and Kris