[HostApp] Friday changes