Change logic in part B