demo project improved