modernized some examples