Part D & bugs fix