Processed @markijbema's comments