Moved check for result consolidation
Reverted support library (crashing on rotation)