Add greivance and fixes #3