Updated edit