more debugging due to adding more scenarios; method renamings;