New desing, json integration