Update - Contactless as much as possible