Fixed Nasreen's bugs