changed some implementation.