Adding Karim's updates