testing & structural changes