*** Removed swap entry now need to remove depends
*** added mode and owner to template