automations partialy fixed