Brought changes from tester back into index.php)