Added suggested changes including DOT