Changes made to Demo instead of final (not work)