Making the demo more readable /  adding AQ to the demo