Consolidation and added in blind spot code now