Kerem, merge my changes. PLLEEAASSEEEE!!