Improve Work Flow