Changes in the implementation section