Updated: logic