changed id passing method