Few small modification