converted computed fields to functions