finish updating demo app to version 4