Adding data
Minor modifications