Work on #2
Fixed #2