Several changes made for testing purposes