some newer changes