Few modifications in order to debug