Cleaned up and bumped to 319.32