Small changes for testing purposes