Removed tracking code from partial and applied it to expanded function.