Tweaks to work better as sub-application.