do everything “the new way” :) almost working...