Updated object names
Added questions to JS