re-worked JSON