Performance tuning, bug fix hallidayResnick-2-3