little fix + changes delivery into public