Finished demo and additional tools