New Working Version

Need query and delete