Various changes to implementation section.