Suggestions for 2.5