Updated Logic.