performance optimizations
corrected sink activity handling