Resolves #1, Resolves #3