got a working old version back on the main branch