Eriks first pass changes