Some small modification made