1516 Commits (fix/screenshots)