changed 3.1 slightly