done some work on the gem