Improved Logic. Increased Samples