Added adam g. changes