WIP: Siesta2 upgrade