added current-methods, preparation for gauges...