Refacterd ID to Name
Made changes to save arraylist
Merge origin/master