did some stuff Refs #1