Reimplemented where suggestions. Close #88