massive logic update