Updated version of the gem