Samantha Cohen: index.php commit 2