More work on keeping app consistent