applying last urgent changes