Worked on f2

feature2 fineshed