Adjusting for standalone use