updated 2 methods, closes #107