fixed + finalized working demo