Short Demo could be done better