Few changes and improvements