merged my changes with erics