making it Demo friendly