Changed to accomodate temporary JSON format