Marijns working version with cap* edits