misal fc7 finished
lets merge
fixed conflicts