Changed to array format for render