Fixed #2, worked on #1