updated locations to be more generic.