Replaced static version by variable