changed key names for better global scoping