Updated more logic.