Made small changes for testing