added some small changes to see it works