Changes on implementation.