adding now-arrow functionality
also renamed json