random changes, more simplification