Little modifications to John's contribution