Preliminary version of forked gem