Modified to reduce output & log size