Auto : Changed few things