Changes for testing purposes