Updated Distributed App logic