commit and enhance antonia's changes