Changed variable name
Handle null objects
Removed unnecessary required parameter
Merge