add some logs and prepare for the cloud !