Modifications for Unite demo