base template tidyup. Pipeline works in debug