Add Karim's Changes