Made all  to @variable