Reworked plain app to require no modifications.