Modified demo to show satgi's issue