#6 Improve how the screenshot is done