r27 Small changes for testing