reintegrating @home changes