changed data structures and dynamic urls