some changes and work with Jhon