[Demo] - Added new steps and fixed a weird bug