Cleaned up 3.1.2 and 3.1.3