Improved Switch Tenders