Changes after demo