Bunch of changes for testing