Changes for demo version