1.1: updated previous changes to f1