Few changes on Semi-Final version