A few updates to make it work