My modifications to Clementine