few twaeks to work with 1.5