my latest version
with payment