too many changes that aren't consistent

let's see how it works