Changes in the implementation