Rework after demo