Initial modifications to test whether  will work