Variety of changes based on feedback from bartvde