12 Commits (fix/screenshots)