Fixed Fatima's code