auto updating and few minor changes