tweaked flow of operations, debugging