modified initial val map size & added missing args