latest changes that kmathern made