fix settings (use global settings!)
update logic v 2.0