Refactornig. Introducing src and dest params. #20