merged changes to reduce load of brute force syner