More normal flow cases added.