working now. fixing #2.