ProductManager and Cashier polished