Few minor BIG and important modifications