More APP Adjustments