Reworked setup trigger