Final commit - adjustments for background operations