refactor to new method scheme itroduced 07.02.2021

Created by: thomaswoehlke