Edited features to satisfy the new logic.