Polished on earlier improvments. This is 1.3