Fixed names
Deleted additional info
Merge branch 'delete_additional_info' into dev