Another changes in implementation