CLOSES #12 #11