Added my local changes helpful for testing

If necessary we can only merge with an earlier commit without these changes