Updated some logic and added screenshots.