merge updates from joao