new offline version, and cleanup
new offline version, and cleanup