Add some more basic average price support