Little updates to have a working version