master: (1) modify schemes to make debugging a bit more easy