Replaced variables with signals