Rewrite to use custom key
update readme