Integrating Abinya's changes