More-better markering...  What a pain in the ass...