2x - closes #2