Updated to dynamic data load (JSON)