Changes to main

but still a bug in v1