New states - closes #3