Added Frans' changes/recommendations