Add Karim's updates