add f7 f8 and fix a bug