First changes after Maarten's initial review