Tenant stated that she was getting no hot water in her bathroom. Customer stated that there was hot water, but it’ll go cold and back to hot. Tested and found that there was hot water, but it took 3 to 5 minutes to get there. Also stated to customer that there was a check valve on heater that may need to be replaced in customer agreed. Replace check valve and tested. No leaks were present at this time. In same bathroom ran water and there was hot water coming out constantly for about 15 minutes. Also tenant asked for us to replace some showerhead so we went ahead and did that and charge $175 to do so. Cleaned up work area. Also found mixing valve on first floor in bedroom bathroom and tested for cross connection. At this time, there was no cross connection.