some small structural changes