wala version now with most recent changes from main branch