New F

small changes