updated to work with computed and formatted values