bug 1087015 - Rewrite of the demo studio logic for more fluidity