Re-worked demo addon