finished fixed demo