Major Update Includes Edit/Delete and Optimisations