Working version of the gem