Finished Updated Screen Flow